From f5bfac99a7635c0ea4b4b3048f3f6fefc3335adf Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sat, 23 Mar 2013 21:25:32 +0000 Subject: [PATCH] Remove hack from GPX writer that over-aggressively quoted apostrophes. Doing that inside a CDATA, for example, is Very Bad. Manually edited the GPS reference files that were affected - all of which were our own data, anyway... git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4357 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/gpx.cc | 5 ----- gpsbabel/reference/LineStyles.gpx | 4 ++-- gpsbabel/reference/compegps-wpt.gpx | 4 ++-- gpsbabel/reference/google-direction.gpx | 6 +++--- gpsbabel/reference/route/cst-sample.gpx | 8 ++++---- gpsbabel/reference/track/teletype.gpx | 8 ++++---- gpsbabel/reference/umsonstdraussen.gpx | 8 ++++---- gpsbabel/reference/unicsv.gpx | 4 ++-- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc index 5d27c0eca..510900ecc 100644 --- a/gpsbabel/gpx.cc +++ b/gpsbabel/gpx.cc @@ -1362,11 +1362,6 @@ gpx_wr_deinit(void) { writer.writeEndDocument(); - // TODO: technically, &apos is almost never required to be encoded, but - // the pre-Qt version of our serializer did, so we'll manually do it here - // for now, in the early days, just to keep things as we've always done it. - ostring.replace("'", "'"); - // TODO: The old writer would more aggressively protect you from control // character nonsense. The control-Z (032)is the only thing that appears in // our test suite, but let's toss things we know aren't allowed in GPX. diff --git a/gpsbabel/reference/LineStyles.gpx b/gpsbabel/reference/LineStyles.gpx index c33483642..e04e02c0a 100644 --- a/gpsbabel/reference/LineStyles.gpx +++ b/gpsbabel/reference/LineStyles.gpx @@ -81,8 +81,8 @@ NOTE 2 - how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) - how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) + how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) + how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) NOTE 3 diff --git a/gpsbabel/reference/compegps-wpt.gpx b/gpsbabel/reference/compegps-wpt.gpx index d39334937..a9b5e3111 100644 --- a/gpsbabel/reference/compegps-wpt.gpx +++ b/gpsbabel/reference/compegps-wpt.gpx @@ -117,8 +117,8 @@ 509.400000 F18051 - ARSIE' - ARSIE' + ARSIE' + ARSIE' Waypoint diff --git a/gpsbabel/reference/google-direction.gpx b/gpsbabel/reference/google-direction.gpx index 0a60320d6..2a3d98106 100644 --- a/gpsbabel/reference/google-direction.gpx +++ b/gpsbabel/reference/google-direction.gpx @@ -4,7 +4,7 @@ step001 - Head south on Rue du Palais toward Rue de l'Ort en Salvy + Head south on Rue du Palais toward Rue de l'Ort en Salvy RPT001 @@ -5133,7 +5133,7 @@ step015 - Turn right onto Route d'Agde/D112Go through 2 roundabouts + Turn right onto Route d'Agde/D112Go through 2 roundabouts RPT1692 @@ -5524,7 +5524,7 @@ step016 - Route d'Agde/D112 turns slightly right and becomes Av. Yves BrunaudGo through 1 roundabout + Route d'Agde/D112 turns slightly right and becomes Av. Yves BrunaudGo through 1 roundabout RPT1821 diff --git a/gpsbabel/reference/route/cst-sample.gpx b/gpsbabel/reference/route/cst-sample.gpx index ff98bcf15..da397fb15 100644 --- a/gpsbabel/reference/route/cst-sample.gpx +++ b/gpsbabel/reference/route/cst-sample.gpx @@ -6,8 +6,8 @@ 1272.900000 1 - Vue de notre chemin du retour.., mais c'est par la route qu'on monte - Vue de notre chemin du retour.., mais c'est par la route qu'on monte + Vue de notre chemin du retour.., mais c'est par la route qu'on monte + Vue de notre chemin du retour.., mais c'est par la route qu'on monte file://C:/Mesdoc/Mes%20images/pic%20midi/DSCF0446.JPG @@ -47,7 +47,7 @@ 1272.900000 1 - Vue de notre chemin du retour.., mais c'est par la route qu'on monte + Vue de notre chemin du retour.., mais c'est par la route qu'on monte 1525.300000 @@ -116,7 +116,7 @@ 1272.900000 1 - Vue de notre chemin du retour.., mais c'est par la route qu'on monte + Vue de notre chemin du retour.., mais c'est par la route qu'on monte 1272.900000 diff --git a/gpsbabel/reference/track/teletype.gpx b/gpsbabel/reference/track/teletype.gpx index 5a8f34d32..496e15d2f 100644 --- a/gpsbabel/reference/track/teletype.gpx +++ b/gpsbabel/reference/track/teletype.gpx @@ -38,12 +38,12 @@ 371 7th Ave\Penn Plz\Fashion Ave, new york, NY 10001, United States - St Patrick's Cathedral - NE[1.30 mi] - St Patrick's Cathedral, 460 Madison Ave, New York, NY 10022 (212-7532261) - NE[1.30 mi] - St Patrick's Cathedral, 460 Madison Ave, New York, NY 10022 (212-7532261) + St Patrick's Cathedral + NE[1.30 mi] - St Patrick's Cathedral, 460 Madison Ave, New York, NY 10022 (212-7532261) + NE[1.30 mi] - St Patrick's Cathedral, 460 Madison Ave, New York, NY 10022 (212-7532261) - St Patrick's Cathedral + St Patrick's Cathedral 460 Madison Ave, New York, NY 10022, 212-7532261 460 Madison Ave, New York, NY 10022, 212-7532261 diff --git a/gpsbabel/reference/umsonstdraussen.gpx b/gpsbabel/reference/umsonstdraussen.gpx index 7ff5d3c03..13d8eaf0f 100644 --- a/gpsbabel/reference/umsonstdraussen.gpx +++ b/gpsbabel/reference/umsonstdraussen.gpx @@ -684,8 +684,8 @@ Rheinkultur - Line Up: A + E aka Masta Ace + Edo G, Baddies, Black President, Black Stone Cherry, Boppin B, Bubonix, Culcha Candela, Get Well Soon, In December, Montreal, No Use For A Name, Olli Schulz, Paramount Styles, Pete Philly + Perquisite, She's All That, Talion aka Snaga + Fard, The Casting Out, Tone, Virginia Jetzt! Datum: 04.07.2009. - Line Up: A + E aka Masta Ace + Edo G, Baddies, Black President, Black Stone Cherry, Boppin B, Bubonix, Culcha Candela, Get Well Soon, In December, Montreal, No Use For A Name, Olli Schulz, Paramount Styles, Pete Philly + Perquisite, She's All That, Talion aka Snaga + Fard, The Casting Out, Tone, Virginia Jetzt! Datum: 04.07.2009. + Line Up: A + E aka Masta Ace + Edo G, Baddies, Black President, Black Stone Cherry, Boppin B, Bubonix, Culcha Candela, Get Well Soon, In December, Montreal, No Use For A Name, Olli Schulz, Paramount Styles, Pete Philly + Perquisite, She's All That, Talion aka Snaga + Fard, The Casting Out, Tone, Virginia Jetzt! Datum: 04.07.2009. + Line Up: A + E aka Masta Ace + Edo G, Baddies, Black President, Black Stone Cherry, Boppin B, Bubonix, Culcha Candela, Get Well Soon, In December, Montreal, No Use For A Name, Olli Schulz, Paramount Styles, Pete Philly + Perquisite, She's All That, Talion aka Snaga + Fard, The Casting Out, Tone, Virginia Jetzt! Datum: 04.07.2009. www.rheinkultur.com @@ -1380,8 +1380,8 @@ Fehmarn Open Air - Das Fehrman Open Air Festival ist für seine friedliche und familiäre Atmosphäre weit über die Grenzen Deutschlands hinaus bekannt. Programm: Bradley's Circus, Chris Farlowe, Cosmic Finger, Errorhead, Großenbroder Shanty Chor, Hamburg Blues Band, Jimmy Cornett, Joanne Shaw Taylor, Peer Knacke, Purple, Rohstoff, Ten Years After. Datum: 05.09.2009, Beginn: 11:00 Uhr. - Das Fehrman Open Air Festival ist für seine friedliche und familiäre Atmosphäre weit über die Grenzen Deutschlands hinaus bekannt. Programm: Bradley's Circus, Chris Farlowe, Cosmic Finger, Errorhead, Großenbroder Shanty Chor, Hamburg Blues Band, Jimmy Cornett, Joanne Shaw Taylor, Peer Knacke, Purple, Rohstoff, Ten Years After. Datum: 05.09.2009, Beginn: 11:00 Uhr. + Das Fehrman Open Air Festival ist für seine friedliche und familiäre Atmosphäre weit über die Grenzen Deutschlands hinaus bekannt. Programm: Bradley's Circus, Chris Farlowe, Cosmic Finger, Errorhead, Großenbroder Shanty Chor, Hamburg Blues Band, Jimmy Cornett, Joanne Shaw Taylor, Peer Knacke, Purple, Rohstoff, Ten Years After. Datum: 05.09.2009, Beginn: 11:00 Uhr. + Das Fehrman Open Air Festival ist für seine friedliche und familiäre Atmosphäre weit über die Grenzen Deutschlands hinaus bekannt. Programm: Bradley's Circus, Chris Farlowe, Cosmic Finger, Errorhead, Großenbroder Shanty Chor, Hamburg Blues Band, Jimmy Cornett, Joanne Shaw Taylor, Peer Knacke, Purple, Rohstoff, Ten Years After. Datum: 05.09.2009, Beginn: 11:00 Uhr. www.fehmarnfestivalgroup.com diff --git a/gpsbabel/reference/unicsv.gpx b/gpsbabel/reference/unicsv.gpx index ba17108fd..97e0ab246 100644 --- a/gpsbabel/reference/unicsv.gpx +++ b/gpsbabel/reference/unicsv.gpx @@ -34,8 +34,8 @@ GC309F - Shy's Hill by FireFighterEng33 - Shy's Hill by FireFighterEng33 + Shy's Hill by FireFighterEng33 + Shy's Hill by FireFighterEng33 GC317A -- 2.30.2